From: Peter Michael Green Date: Mon, 13 Jan 2020 03:31:54 +0000 (+0000) Subject: Manual merge of version 2.0.0-3+rpi1 and 2.1.0-2 to produce 2.1.0-2+rpi1 X-Git-Tag: archive/raspbian/2.1.0-2+rpi1~2 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=18d39cb0fc06668403edd9b7ad087d20feb7aa24;p=volk.git Manual merge of version 2.0.0-3+rpi1 and 2.1.0-2 to produce 2.1.0-2+rpi1 --- 18d39cb0fc06668403edd9b7ad087d20feb7aa24 diff --cc debian/changelog index 3e9d50b,37cbfe8..9937c3f --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,21 +1,28 @@@ - volk (2.0.0-3+rpi1) bullseye-staging; urgency=medium ++volk (2.1.0-2+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 1.1-1+rpi1 by Peter Michael Green at Sun, 20 Sep 2015 20:30:19 +0000] + * Disable neon. + - -- Raspbian forward porter Wed, 20 Nov 2019 05:46:20 +0000 ++ -- Peter Michael Green Mon, 13 Jan 2020 03:31:02 +0000 ++ + volk (2.1.0-2) unstable; urgency=medium + + * Upload to unstable + + -- A. Maitland Bottoms Sun, 05 Jan 2020 23:17:57 -0500 + + volk (2.1.0-1) experimental; urgency=medium + + * New upstream release + - The AVX FMA rotator bug is fixed + - VOLK offers `volk::vector<>` for C++ to follow RAII + - Use C++17 `std::filesystem` + - This enables VOLK to be built without Boost if available! + - lots of bugfixes + - more optimized kernels, especially more NEON versions + * Upload to experimental for new ABI library package libvolk2.1 + + -- A. Maitland Bottoms Sun, 22 Dec 2019 10:27:36 -0500 volk (2.0.0-3) unstable; urgency=medium diff --cc debian/patches/series index f67e388,54934f3..caca937 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,7 -1,3 +1,4 @@@ - 0001-Fix-AVX-FMA-rotator.patch - 0002-Fail-tests-if-non-numbers-are-detected.patch - 0003-Use-sensible-scalars-for-rotator-and-power.patch - native-armv7-build-support make-acc-happy optional-static-apps + remove-external-HTML-resources +disable-neon diff --cc lib/CMakeLists.txt index 1911a46,0ca3244..7356d7c --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@@ -281,14 -273,7 +273,8 @@@ else(neon_compile_result OVERRULE_ARCH(neonv8 "Compiler doesn't support NEON") endif(neon_compile_result) - ######################################################################## - # if building Debian armel, eliminate neon --######################################################################## - #if(${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "arm-linux-gnueabi") - OVERRULE_ARCH(neon "We don't want neon on raspbian") - #endif(${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "arm-linux-gnueabi") ++OVERRULE_ARCH(neon "We don't want neon on raspbian") + - ######################################################################## # implement overruling in the ORC case, # since ORC always passes flag detection ######################################################################## @@@ -447,44 -432,32 +433,32 @@@ string(REPLACE "\n" " \\n" COMPILER_INF # Handle ASM support # on by default, but let users turn it off ######################################################################## - if((${CMAKE_VERSION} VERSION_GREATER "2.8.9") AND NOT (${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "arm-linux-gnueabi")) - set(ASM_ARCHS_AVAILABLE "neonv7" "neonv8") - - set(FULL_C_FLAGS "${CMAKE_C_FLAGS}" "${CMAKE_CXX_COMPILER_ARG1}") - - # sort through a list of all architectures we have ASM for - # if we find one that matches our current system architecture - # set up the assembler flags and include the source files - foreach(ARCH ${ASM_ARCHS_AVAILABLE}) - string(REGEX MATCH "${ARCH}" ASM_ARCH "${available_archs}") - if( ASM_ARCH STREQUAL "neonv7xxxxx" ) - message(STATUS "---- Adding ASM files") # we always use ATT syntax - message(STATUS "-- Detected neon architecture; enabling ASM") - # setup architecture specific assembler flags - set(ARCH_ASM_FLAGS "-mfpu=neon -g") - # then add the files - include_directories(${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon) - file(GLOB asm_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon/*.s) - foreach(asm_file ${asm_files}) - list(APPEND volk_sources ${asm_file}) - message(STATUS "Adding source file: ${asm_file}") - endforeach(asm_file) - endif() - enable_language(ASM) - set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${ARCH_ASM_FLAGS}") - message(STATUS "c flags: ${FULL_C_FLAGS}") - message(STATUS "asm flags: ${CMAKE_ASM_FLAGS}") - endforeach(ARCH) - - else((${CMAKE_VERSION} VERSION_GREATER "2.8.9") AND NOT (${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "arm-linux-gnueabi")) - message(STATUS "Not enabling ASM support. CMake >= 2.8.10 required.") - foreach(machine_name ${available_machines}) - string(REGEX MATCH "neon" NEON_MACHINE ${machine_name}) - if( NEON_MACHINE STREQUAL "neon") - message(FATAL_ERROR "CMake >= 2.8.10 is required for ARM NEON support") - endif() - endforeach() - endif((${CMAKE_VERSION} VERSION_GREATER "2.8.9") AND NOT (${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "arm-linux-gnueabi")) + set(ASM_ARCHS_AVAILABLE "neonv7" "neonv8") + + set(FULL_C_FLAGS "${CMAKE_C_FLAGS}" "${CMAKE_CXX_COMPILER_ARG1}") + + # sort through a list of all architectures we have ASM for + # if we find one that matches our current system architecture + # set up the assembler flags and include the source files + foreach(ARCH ${ASM_ARCHS_AVAILABLE}) + string(REGEX MATCH "${ARCH}" ASM_ARCH "${available_archs}") -if( ASM_ARCH STREQUAL "neonv7" ) ++if( ASM_ARCH STREQUAL "neonv7xxxxxxxxxx" ) + message(STATUS "---- Adding ASM files") # we always use ATT syntax + message(STATUS "-- Detected neon architecture; enabling ASM") + # architecture specific assembler flags are now set in the cmake toolchain file + # then add the files + include_directories(${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon) + file(GLOB asm_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon/*.s) + foreach(asm_file ${asm_files}) + list(APPEND volk_sources ${asm_file}) + message(STATUS "Adding source file: ${asm_file}") + endforeach(asm_file) + endif() + enable_language(ASM) + message(STATUS "c flags: ${FULL_C_FLAGS}") + message(STATUS "asm flags: ${CMAKE_ASM_FLAGS}") + endforeach(ARCH) + ######################################################################## # Handle orc support